Pass more const class arguements by refernces, a fix const correctness fixes, declare...

diff --git a/gpsbabel/bcr.cc b/gpsbabel/bcr.cc
index 60358a5970f8f0a40f8a07ec4ab4a659782931b5..82d6507fca6ae7610ec56bafd905c4cbfa235923 100644 (file)
--- a/gpsbabel/bcr.cc
+++ b/gpsbabel/bcr.cc
@@ -154,7 +154,7 @@ bcr_handle_icon_str(const char* str, waypoint* wpt)
 }
 
 static const char*
-get_bcr_icon_from_icon_descr(QString icon_descr)
+get_bcr_icon_from_icon_descr(const QString& icon_descr)
 {
   const char* result = BCR_DEF_ICON;
 

diff --git a/gpsbabel/garmin.cc b/gpsbabel/garmin.cc
index 51cf03c34ff04370856a9869d362965a89f06624..151dc6752be82f20f5c3dbf35bb8624a53e3249e 100644 (file)
--- a/gpsbabel/garmin.cc
+++ b/gpsbabel/garmin.cc
@@ -97,7 +97,7 @@ arglist_t garmin_args[] = {
 };
 
 static const char* d103_symbol_from_icon_number(unsigned int n);
-static int d103_icon_number_from_symbol(QString s);
+static int d103_icon_number_from_symbol(const QString& s);
 
 
 static void
@@ -1272,7 +1272,7 @@ d103_symbol_from_icon_number(unsigned int n)
 }
 
 static int
-d103_icon_number_from_symbol(QString s)
+d103_icon_number_from_symbol(const QString& s)
 {
   unsigned int i;
 

diff --git a/gpsbabel/garmin_txt.cc b/gpsbabel/garmin_txt.cc
index 78ad18bac50996257292e7d9056deebcb0fdc94d..b66e6da4d9d07d40eb01a331d823e7728e45bc79 100644 (file)
--- a/gpsbabel/garmin_txt.cc
+++ b/gpsbabel/garmin_txt.cc
@@ -524,7 +524,7 @@ print_string(const char* fmt, const char* string)
 }
 
 static void
-print_string(const char* fmt, QString string)
+print_string(const char* fmt, const QString& string)
 {
   print_string(fmt, string.toUtf8().data());
 }

diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc
index b072101f38e8ad6feb9914490608f8389beedde0..562598d61c87db279d78e8470945c60315f7f29c 100644 (file)
--- a/gpsbabel/gdb.cc
+++ b/gpsbabel/gdb.cc
@@ -404,7 +404,7 @@ gdb_write_cstr_list(const char* str)
 }
 
 static void
-gdb_write_cstr_list(const QString str)
+gdb_write_cstr_list(const QString& str)
 {
   return gdb_write_cstr_list(str.toAscii().data());
 }

diff --git a/gpsbabel/geo.cc b/gpsbabel/geo.cc
index d72508243f8254ef1248324d81c68ddc95bfb004..64953d9d75f8b3bc457a62bbfffd90b5ea5575e5 100644 (file)
--- a/gpsbabel/geo.cc
+++ b/gpsbabel/geo.cc
@@ -53,16 +53,16 @@ geocache_container wpt_container(const QString&);
 
 // Compensate for most of class waypt still using C strings and needing 
 // copies anyway.
-char * ShimString(QString s) 
+char * ShimString(const QString& s) 
 {
   return xstrdup(s.toUtf8().data());
 }
-char * ShimString(QStringRef s) 
+char * ShimString(const QStringRef& s) 
 {
   return xstrdup(s.toString().toUtf8().data());
 }
 
-double ShimAttributeDouble(QXmlStreamAttributes a, QString v) 
+double ShimAttributeDouble(const QXmlStreamAttributes& a, const QString& v) 
 {
   QString rv  = a.value(v).toString();
   return rv.toDouble();

diff --git a/gpsbabel/gtm.cc b/gpsbabel/gtm.cc
index 6b500eeeff37e68ad5acf9b467b3f1717deb1351..6df08b2eb9e48e59ac3d7758263565fb156fdbca 100644 (file)
--- a/gpsbabel/gtm.cc
+++ b/gpsbabel/gtm.cc
@@ -712,7 +712,7 @@ gtm_read(void)
   }
 }
 
-int icon_from_descr(QString descr)
+static int icon_from_descr(const QString& descr)
 {
   for (int i = 0; icon_descr[i]; i++) {
     if (descr.compare(icon_descr[i]) == 0) {

diff --git a/gpsbabel/lowranceusr.cc b/gpsbabel/lowranceusr.cc
index c2e835cb00c11d1d81b0c1f4653aa05006de27bf..233dbe57614462c9d9c0f08a3f35146aadea923b 100644 (file)
--- a/gpsbabel/lowranceusr.cc
+++ b/gpsbabel/lowranceusr.cc
@@ -267,8 +267,8 @@ lowranceusr_find_desc_from_icon_number(const int icon)
   return "";
 }
 
-int
-lowranceusr_find_icon_number_from_desc(QString desc)
+static int
+lowranceusr_find_icon_number_from_desc(const QString& desc)
 {
   const lowranceusr_icon_mapping_t* i;
   int n;